forced preference file name
Merge branch 'ics+' into pref_fragment

Conflicts:
	src/ro/weednet/contactssync/activities/Preferences.java