most views working; beginning to clean code, and fix updates
Merge origin/master

Conflicts:
	register/view/info.php