Screen Size
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/dexedLibs/activation-db73cfa705d70438fc145224b68e6d16.jar
	Black
Boss/bin/dexedLibs/additionnal-cc8280bf2132aef076e4e08644eae776.jar
	Black Boss/bin/dexedLibs/mail-65a115d6a0b66d5c285bc8e79cca53e0.jar
	Black Boss/bin/resources.ap_