master
Merge branch 'stage'

Conflicts:
	README.md
change master
change to dev