iuyg,gh
Merge branch 'master' of https://github.com/BlackBossOrg/BlackBoss.git

Conflicts:
	Black Boss/bin/Black Boss.apk
	Black Boss/bin/classes.dex
	Black Boss/bin/resources.ap_
	Black Boss/res/layout/activity_black_boss.xml
	Black Boss/src/org/blackboss/blackboss/LoginActivity.java