finx
Merge branch 'develop' of https://github.com/eedonge/byulme into develop

Conflicts:
	0.01/public/script/router.js
	0.01/public/script/view/about/aboutView.js