New Settings for Position update Interval in active and passive Mode
Merge branch 'master' of https://github.com/Gargo83/enl-atitude

Conflicts:
	app/AndroidManifest.xml
	app/src/ch/n3utrino/enlatitude/services/UpdateService.java