Renaming controllers
Fixing references
Git now ignores example files
Making use of scene controller
Working on modal scene
Merge branch 'refactor' into merge-br

Conflicts:
	.gitignore