1.0.0 master: Refactor code
Merge branch 'master' of https://github.com/PsyduckMans/demo.git

Conflicts:
	composer.json

Change-Id: If1c5745756d9bd78f80d4276c42bc05b83928321