Modified manifest for testing purposes
Merge conflict resolution.
Merge branch 'master' of https://github.com/jacobrs/HwrkIt into devss

Conflicts:
	HwrkIt/AndroidManifest.xml
	HwrkIt/bin/AndroidManifest.xml
	HwrkIt/src/com/jabs/hwrkit/MainActivity.java
Added PieChart back into MainActivity for testing (stub)
Alex's changes
Merge branch 'master' of https://github.com/jacobrs/HwrkIt into devss
Fixed 5.0 activity_login crash
Merge branch 'master' of https://github.com/jacobrs/HwrkIt
Merge branch 'devss'