BoxOpsi.java
BoxOpsi
Merge branch 'master' of https://github.com/luthfichandra/SchoolLife

Conflicts:
	bin/classes.dex
	bin/resources.ap_
	project.properties