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
Dream status is string.
Merge pull request #49 from geekhub-php/fix-status

[DONE] Dream status is string.
composer.phar update
restore point
merge dev into support dream fut

Conflicts:
	src/Geekhub/DreamBundle/Entity/Dream.php
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
bower :)
merge