Philipp Schaefer 796f693370 Merge branch 'development'
Conflicts:
	mobile/res/xml/preferences.xml
	mobile/src/com/cradle/iitc_mobile/fragments/MainSettings.java
2013-10-22 20:45:06 +02:00
..
2013-10-22 20:45:06 +02:00