Server starts
Fixed user fields
Fixed authentication
updated gems
Updated csv initializer
Fixed configuration
Fixed messages and references
Improved factories
Fixed conversations helper
Fixed itineraries spec
Fixed facebook data cacher spec
Updated gems
Update
Update
Merge branch 'master' of https://github.com/hexlator/blacoin

Conflicts:
	Gemfile
	Gemfile.lock