clean up
Merge branch 'master' of https://github.com/ducdigital/s42m
Merge branch 'master' of https://github.com/ducdigital/s42m

Conflicts:
	www/templates/edit_profile.html
Merge branch 'master' of https://github.com/ducdigital/s42m
The array horizontal lists are working :).
Completed the view profile page