Merge branches 'dp_3dr_services' and 'master' of https://github.com/DroidPlanner/droidplanner into dp_3dr_services

Conflicts:
	Android/src/org/droidplanner/android/activities/EditorActivity.java
	Android/src/org/droidplanner/android/fragments/ParamsFragment.java
	Android/src/org/droidplanner/android/proxy/mission/MissionProxy.java
	Android/src/org/droidplanner/android/proxy/mission/item/MissionItemProxy.java
	Android/src/org/droidplanner/android/utils/file/IO/MissionReader.java
	Android/src/org/droidplanner/android/widgets/adapterViews/ParamsAdapter.java
	Android/src/org/droidplanner/android/widgets/adapterViews/ParamsAdapterItem.java