update
Merge branch 'master' of https://github.com/chunterg/LightWeb-1

Conflicts:
	controllers/siteController.js