change remote
Merge branch 'cm-11.0' of https://github.com/imercm/android into cm-11.0

Conflicts:
	default.xml