assets
modified page fragment
Merge branch 'branch_mon'

Conflicts:
	PorkChop/project.properties
added DIY activity
Merge branch 'branch_rodel'

Conflicts:
	PorkChop/AndroidManifest.xml
	PorkChop/src/ph/gov/kabantayngbayan/porkchop/MainActivity.java
Merge branch 'branch_mon'