First commit
Removing dead code
Merge branch 'refs/heads/gh-pages'

Conflicts:
	app/bookmarks/directives/CreateBookmarkDirective.js
	app/bookmarks/directives/EditBookmarkDirective.js