Preference functionality
Merge branch 'master' of https://github.com/psybuzz/Where-Did-the-Time-Go

Conflicts:
	app/src/main/java/wdttg/wheredidthetimego/SettingsActivity.java
Merge branch 'master' of https://github.com/psybuzz/Where-Did-the-Time-Go
Merge branch 'master' of https://github.com/psybuzz/Where-Did-the-Time-Go
Redo reverted stuff
Merge branch 'master' of https://github.com/psybuzz/Where-Did-the-Time-Go