Merge branch 'master' of https://github.com/xcvista/Deuterium

Conflicts:
	Deuterium/Deuterium.xcodeproj/project.pbxproj
Conflict
Revert "Conflict"

This reverts commit 6620c3bea98baac719508168f83c35b19108e27c.
Revert "Merge branch 'master' of https://github.com/xcvista/Deuterium"

This reverts commit 2b8b14d30c6b70f0fcd543e8571fb00eab1d8fdc.
Merge branch 'master' of https://github.com/xcvista/Deuterium