Add menu id
Prepare Content screen for db.
Merge branch 'master' of https://github.com/Apptitive/Apptitive-Content-Display

Conflicts:
	content display/src/main/AndroidManifest.xml