Merged master and grunt build
updated the styleguide and changed the path for the written and markdown guide
fixing conflicts
Merged develop and grunt build