Cleaned up AddContent code
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Add dialog box for delete blubz
Add dialog box for delete blubz