Update manifest
Some repos are obsolete and should track CM ones
Merge branch 'cm-12.0' of https://github.com/ArchiDroid/manifest into cm-12.0

# By JustArchi
# Via JustArchi
* 'cm-12.0' of https://github.com/ArchiDroid/manifest:
  Update manifest Some repos are obsolete and should track CM ones

Conflicts:
	roomservice.xml