add
Merge branch 'master' of github.com:andro-med/android

Conflicts:
	default.xml
	default.xml~