fixed issue #11
fixed typo
working on new editor step 1
still working on markdown editor
changed ckeditor layout and added a markdown editor.
updated dependencies

updated fontawesome to 3.0
updated bootstrap to 2.3.1
3.3.0
Merge branch '3.3.0-wip'

Conflicts:
	public/js/archive_new.js
	public/stylesheets/common.css
	views/en/archive_new.ejs
Merge branch 'master' into cloudfoundry (current version 3.3.0deb)

Conflicts:
	package.json