intergrate bootstrap
fixe ckditor reference error
Merge branch 'master' into bootstrap

Conflicts:
	forum_demo/app/assets/javascripts/application.js
ui update
Merge branch 'bootstrap'
intergrate simple form
Merge branch 'simple_form'
update database backup