menu managing by jihin
Merge branch 'master' of https://github.com/baabte/baabtra

Conflicts:
	app.less
	config.router.pages.js
	index.html
fixed conflicts - landing page - by jihin