Gulp Util
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/directives/sv-top-nav.html
	gulp/server.js
Merge branch 'master' of C:\App\fengshui with conflicts.
Merge remote-tracking branch 'origin/master'
fengshui-5 Add new post by Admin functionality (CRUD of posts and comments)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/directives/sv-top-nav.html
	app/views/directives/sv-top-nav.jade