Is this right ?! ?!
File cleanup
Merge https://github.com/Anthoknee/jaams-web into anthony

Conflicts:
	index.php
Merged in Anthony and Adrian's changes, fixed index.php and default-inputs.template.php