project structure and jquery
Merge branch 'devel' of https://github.com/TheComet93/immense-pony-peril into devel

Conflicts:
	.gitignore