gpuimage added
made uploading possible
added time holder
sync time with server
added resources
log date and keep up
added global author
removed logs
stuff
filter stuff
Merge remote-tracking branch 'origin/hannes'

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
Merge remote-tracking branch 'origin/simon'

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
	feels/feels/en.lproj/MainStoryboard.storyboard
stuff
blääää
Merge remote-tracking branch 'origin/simon'

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	feels/feels.xcodeproj/project.pbxproj
	feels/feels/en.lproj/MainStoryboard.storyboard
added lots of shit
Camerar
Merge branch 'master' of github.com:hellozimi/feels into simon

Conflicts:
	feels/feels.xcodeproj/project.pbxproj