Merge branch 'Dev'

Conflicts:
	iMVC/Application/Application.php
	public/index.php