kouroshchanges
kouroshchanges including sql
Merge remote-tracking branch 'origin/master'

Conflicts:
	Wear/Wear.v12.suo
	Wear/Wear/.ntvs_analysis.dat
	Wear/Wear/app.js
	Wear/Wear/obj/Debug/Wear.njsproj.FileListAbsolute.txt
	Wear/Wear/obj/Debug/app.js
	Wear/Wear/views/index.jade
kouroshchanges3
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	Wear/Wear.v12.suo
	Wear/Wear/.ntvs_analysis.dat
	Wear/Wear/app.js
	Wear/Wear/obj/Debug/Wear.njsproj.FileListAbsolute.txt
	Wear/Wear/obj/Debug/app.js
	Wear/Wear/views/index.jade