Merge branch 'master' of https://github.com/Fredyelmer/studia

Conflicts:
Sttudia.xcodeproj/project.pbxproj
Sttudia/View/Base.lproj/MainStoryboard.storyboard
Merge branch 'master' of https://github.com/Fredyelmer/studia

Conflicts:
	Sttudia.xcodeproj/project.pbxproj
	Sttudia/View/Base.lproj/MainStoryboard.storyboard