Ringtone doet het
Merge branch 'master' into TestingGround

Conflicts:
	gen/com/teamheadlesschicken/comfywake/R.java
	src/com/teamheadlesschicken/comfywake/Alarm/AlarmReceiver.java
	src/com/teamheadlesschicken/comfywake/Utilities/NotificationActivity.java
	src/com/teamheadlesschicken/comfywake/Utilities/SettingsActivity.java