initial upload
bug fixes
bug fixes
i18n
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/HomeController.php
	app/models/Offer.php
	app/views/auth/remind.blade.php
	app/views/cities/create.blade.php
	app/views/cities/show.blade.php
	app/views/comments/edit.blade.php
	app/views/comments/index.blade.php
	app/views/companies/show.blade.php
	app/views/emails/welcome.blade.php
	app/views/home/index.blade.php
	app/views/layouts/scaffold.blade.php
	app/views/login/dashboard.blade.php
	app/views/login/register.blade.php
	app/views/offers/create.blade.php
	app/views/offers/index.blade.php
	composer.lock
	vendor/composer/autoload_classmap.php
remove hello