music
Merge branch 'andreas' of github.com:hellozimi/feels into simon

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
	feels/feels/en.lproj/MainStoryboard.storyboard
made uploading possible
Added root view and initial graphics
added time holder
sync time with server
added resources
log date and keep up
added global author
removed logs
provisioning profile stuff
Added fonts
Fonts category
Work
filter stuff
Merge remote-tracking branch 'origin/hannes'

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
UILabel category with kerning
Menu work
Merge remote-tracking branch 'origin/simon'

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
	feels/feels/en.lproj/MainStoryboard.storyboard
stuff