added function for normal-land
default server
need to put objects at last position
cleanup
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	AdHoc-Railway/src/main/java/ch/fork/adhocrailway/android/fragments/MainControllerFragment.java