rodel
Merge branch 'branch_rodel'

Conflicts:
	PorkChop/AndroidManifest.xml
	PorkChop/src/ph/gov/kabantayngbayan/porkchop/MainActivity.java