aiai
Merge branch 'dev' of https://github.com/joaochencci/away into dev

Conflicts:
	Away/Base.lproj/Main.storyboard
	Away/MainViewController.m
Almost there