resized buttons and other CSS stuff
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #33 from julierwr/development

Resized buttons and other CSS stuff