Additions of Picks and News
Merge branch 'master' of https://github.com/mjpuser/nsite

Conflicts:
	app/client/application/view-config.js
NewButtons