Fixed routing for show and create tours. fixed #12
Search bar works. fixes #8
Improved gulpfile so `gulp` runs scss, db, nodemon
Merge branch 'ionic' of https://github.com/BraveBeehive/wanderlust into ionic

Conflicts:
	client/www/app/main/main.controller.js
	client/www/app/main/main.html
	client/www/app/tours/tours.controller.js
	client/www/app/tours/tours.html
	server/api/city/city.controller.js
Merge pull request #32 from mLuby/ionic

Fixed routing for show and create tours. fixed #12