branch 1.0
first release
fixed cache issue during front editing
Merge remote-tracking branch 'origin/1.0'

Conflicts:
	composer.json