Mail fix.
Mail fix.
Mail fix.
Mail sending problem.
conflict cleaning
Added carrier wave.
Added active admin
gmail settings
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev
Adding models.
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev
Foreman added to control the processes
admin initial
conflict fix
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev

Conflicts:
	Gemfile
	Gemfile.lock
	config/environments/development.rb
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev
admins
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev
Adding models.
Merge branch 'dev' of github.com:cipele46/cipele46-web into dev