commit before fetching
Merge branch 'master' of https://github.com/LifeLogTLeaf/LifeLogCollector

Conflicts:
	project.properties
	src/com/tleaf/lifelog/activity/MainActivity.java

conflict solved