adding file
permissions in the manifest
commiting my files
merged changes
merging conflicts and adding new files
manifest changes
merging manifest
Merge branch 'master' of https://github.com/pcsmits/homebase

Conflicts:
	root/homeBase/res/values/ids.xml