latest updates
Merge branch 'master' of https://github.com/enkhi77/stofti.com

Conflicts:
	public/partials/navbar.html
Merge remote-tracking branch 'origin/master'