Order Structure mainly
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/main/mesanius/no/mobilecase2014/MainActivity.java