Modified styleguide SCSS to be closer to the latest state of patternlab-php (so that it even works with Twitter Bootstrap)
Merge pull request #45 from etecture/dev

Modified styleguide SCSS to be closer to the latest state of patternlab-...
version bump on rebuild
annotation, code support, ishOptions

synced some client code with pl-php. support for ishControlsVisible -
which can turn off features as not needed or implemented yet.

annotation and code support is present

reorganized some files to align with pl-php, not as clean yet but
working toward it!
Merge branch 'dev' of https://github.com/midnightspecial/patternlab-node into dev

Conflicts:
	builder/object_factory.js
	builder/patternlab.js
remove junk merge data