Added remaining template stubs, created urls and views
Merge remote-tracking branch 'origin/master'

Conflicts:
	Organiser/.idea/workspace.xml
Merge and correct .gitignore enty