new sources
Merge remote-tracking branch 'origin/master'

Conflicts:

	trunk/MyHealthAssistant/src/com/gravity/innovations/mha/MainActivity.java