Remove extra stuff
fix a bug!
new feature
Merge branch 'release/1.1.0' into develop

* release/1.1.0:
  fix a bug!

Conflicts:
	index.php