Merge branch 'master' of github.com:CirrusCPQ/mockups into gh-pages

Conflicts:
	README.md
Merge branch 'gh-pages' of github.com:CirrusCPQ/mockups into gh-pages

Conflicts:
	README.md
Version 2 Basil