Optimizing code
Merge branch 'master' of https://github.com/wlmirand/pims.git

Conflicts:
	src/com/lge/competence/pims/calendar/activities/MainActivity.java