Ready for golive
Updated readme
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	GruntFile.js
	README.md
	package.json
	public/css/iwnet.css
	public/index.html
	public/scripts.js