5.29
Merge branch 'master' of https://github.com/sonyi/androidClass

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/ActivityLife/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/Calculate/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/Calculate/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
5.293333333