Merge branch 'master' of github.com:kbsbng/Sunrise-Sunset-Calculator

Conflicts:
	AndroidManifest.xml