Commit to sync

<!-- Written by QtCreator 3.1.1, 2014-09-04T14:01:21. -->
<!-- Written by QtCreator 3.1.1, 2014-09-05T02:41:07. -->
Merge remote-tracking branch 'origin/master'

Conflicts:
	Fallskjermhopper/Fallskjermhopper.pro.user
Merge remote-tracking branch 'origin/master'

Conflicts:
	Fallskjermhopper/Fallskjermhopper.pro.user
Merge branch 'master' of https://github.com/NOddi89/FallskjermHopper