Merge branch 'master' of https://github.com/DavidPsy/DVUs

Conflicts:
	DVUs.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/DavidPsy/DVUs

Conflicts:
	DVUs.xcodeproj/project.pbxproj