Small interface changes
Merge branch 'master' of https://github.com/jordannick/AiM-Mobile

Conflicts:
	AiM Mobile/AiMTabMainViewController.m