Initial Merge
SUO
First Change
First deploy
Cleaning up initial project
Testing SmartGit
Merge branch 'master'

Conflicts:
	Blog/Blog/obj/Debug/Package/PackageTmp/routes/user.js
	Blog/Blog/views/index.jade
Merge branch 'development'