language manager
language manager
using context.getFilesDir
camelcase fixed (again)
Merge branch 'muriel'
i18n redo

Conflicts:
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/LogInActivity.java
	zipato_android_v2/src/main/java/android/zipato_android_v2/app/ZipatoApplication.java
	zipato_android_v2/src/main/java/com/zipato/appv2/BaseActivity.java
	zipato_android_v2/src/main/java/com/zipato/appv2/ui/ExpendableListerViewCustomAdapter.java
	zipato_android_v2/src/main/java/com/zipato/appv2/ui/MyGroupClickListner.java
	zipato_android_v2/src/main/java/com/zipato/appv2/ui/fragments/SettingMenuFragment.java
	zipato_android_v2/src/main/java/com/zipato/data/SimpleRepository.java
	zipato_android_v2/zipato_android_v2.iml