no message
Merge branch 'master' of http://github.com/MobilityInitiative/MIMaster-Android

Conflicts:
	MIMaster/src/main/java/com/mobilityinitiative/mimaster/FragmentPreferences.java
	MIMaster/src/main/java/com/mobilityinitiative/mimaster/PreferencesActivity.java