Merge branch 'master' into develop
updated according to inuitcss
Merge branch 'update' into develop
Merge branch 'develop'
bumped version number