Initial commit
Merge branch 'development'

Conflicts:
	package.json