merging
merging
Merge branch 'master' of https://github.com/paulsenjs/PinisiApps.git

Conflicts:
	PinisiElektra/src/com/pinisielektra/apps/ReportActivity.java