Rearrange cells in table view / Xcode 7 and Swift 2 support#2

croossin wants to merge 2 commits intoazamsharp:masterazamsharp/WatchNotes:masterfrom

croossin:mastercroossin/WatchNotes:masterCopy head branch name to clipboard