Notes Tab update
Merge branch 'master' of https://github.com/jordannick/AiM-Mobile

Conflicts:
	AiM Mobile/Model/AiMUser.m
	AiM Mobile/iPhone_Main.storyboard