mergeada
Merge branch 'master' of https://github.com/JoaoSisanoski/AppGym

Conflicts:
	FP/AMSlideMenu/CreateTrainViewController.m
	FP/CurrentTrainTableViewController.m
	FP/StartWorkOutVC.m