add nav-bar item
add nav-bar menus
Merge branch 'master' of github.com:zerdliu/Aqueducts

Conflicts:
	app/views/layouts/application.html.erb
use Grape-Entity to gen json
domain/api -> api.domain/
Merge pull request #21 from zerdliu/master

api