Merge pull request #1 from QtheEskimo/develop

styling improvements
Merge pull request #2 from QtheEskimo/develop

Css changes mostlly
Merge pull request #4 from QtheEskimo/develop

Logo changes on client page
Merge pull request #6 from QtheEskimo/develop

set maximum blogs shown to 50
Merge pull request #8 from QtheEskimo/develop

Deploys develop to master
Merge pull request #10 from QtheEskimo/develop

Merger from develop
Merge pull request #13 from QtheEskimo/develop

merged changes from develop
Update style.css
Merge pull request #15 from QtheEskimo/develop

merges new gaa template from dev
Title change in more_info widget
Merge pull request #17 from QtheEskimo/develop

new gaa sidebar
changed link on home page.
changed link in widget box
Merge pull request #18 from QtheEskimo/develop

typo fix
remove comment number from top of blog
Merge pull request #21 from QtheEskimo/develop

Newclient
fixed merge conflict after merging master->develop