Merge branch 'dev' of github.com:sheedy/ux-prototype into dev

Conflicts:
	.bowerrc
	.gitignore
	Gruntfile.js
	bower.json
	package.json
	src/content/pages/patterns.hbs
	src/content/partials/_footer.hbs
	src/content/partials/_head.hbs
	src/content/templates/custom.hbs
	src/content/templates/default.hbs
	src/content/templates/rwd.hbs
	src/docs/patterns/forms/dropdown/dropdown.json
	tasks/options/assemble.js
	tasks/options/concurrent.js
	tasks/options/connect.js
	tasks/options/sass.js
	tasks/options/watch.js
Release v0.0.2
Deleted files from last merge
Merge branch 'master' into dev
Deleted files from last merge