added main to the root
Merge remote-tracking branch 'origin/master' into amlakgostar

Conflicts:
	bin/Coreapp.apk
	bin/classes.dex
	bin/classes/com/ata/coreapp/R$id.class
	bin/dexedLibs/corebase-4d34a860f9695a0c95ca56e743f6a7e3.jar
	bin/resources.ap_
	gen/com/ata/coreapp/R.java
added master acitvity
changed star activity