Merge https://github.com/harviacode/14112014

Conflicts:
	.gitignore
	README.md
	home.php
	index.php
	loader.php
	nbproject/project.xml
Merge https://github.com/harviacode/14112014

Conflicts:
	route/user.php
Merge https://github.com/harviacode/14112014

Conflicts:
	route/user.php