fixed comments
fixed css
fixed test and line in js
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #64 from badnack/development

Development