add primaryKey support and testing
Merge branch 'master' of github.com:mwaylabs/generator-m-server

Conflicts:
	script-base.js