+ serialization/ build
+ text editor
update
Merge branch 'master' of https://github.com/BambusStudio/content-editor

Conflicts:
	Gruntfile.js
	app/index.html
	app/js/columns-editor.js
	app/templates/_index.html
	scss/pages/home/_app.scss
ver. 0.1 alpha
beta release
update
update
Merge branch 'master' of //DISKSTATION/share/GIT/responsive-editor

Conflicts:
	app/js/responsive-editor.js
fix