Restructured files and folders
Merge origin/master

Conflicts:
	public_html/views/login.html
	public_html/views/register.html