test fix to captcha
test#2 fix to captcha
test#3 fix to captcha added composer.lock
deleted ext-gd : *
Merge branch 'develop' into fix-ext-gd
updated composer.lock
used trait for User's contact fields
Added bower. Move all js dependency to vendor directory
Merge pull request #51 from geekhub-php/fix-user-contacts

used trait for User's contact fields
Merge pull request #44 from geekhub-php/fix-ext-gd

[DONE] Scrutinizer and new composer
Updated travis yml
Made bower install first
Merge pull request #52 from geekhub-php/added-bower

Added bower. Move all js dependency to vendor directory
small fix
bower :)
merge
composer restore
Updated glyphicon for equipment
fix template
Merge branch 'develop' of https://github.com/geekhub-php/CheDream2 into develop