update
Merge branch 'dev' of http://www.github.com/simplonco/simplonline into dev
suppression de la date de
test taduction message erreur connexion
Merge branch 'dev' of https://github.com/simplonco/simplonline into dev

Conflicts:
	db/seeds.rb
	test/controllers/sessions_controller_test.rb
Merge branch 'dev' of http://www.github.com/simplonco/simplonline into dev
shorter last messages in forum on the dashboard
update of sessions_controller_test.rb
Merge branch 'dev' of http://www.github.com/simplonco/simplonline into dev
Allow use of html balises in posts
Improvode visualisation of messages index in forum
Improved visualisation text for messages index in Forum
Merge branch 'dev' of https://github.com/simplonco/simplonline into dev
Merge branch 'dev' of http://www.github.com/simplonco/simplonline into dev
Parent message should be accessible in dashboard

Add link to message with an url for parent message
Push pull on origin with good branch
Merge branch 'prod' into dev

Conflicts:
	db/seeds.rb
Specify to use simplonline-prod
Merge branch 'dev' of http://www.github.com/simplonco/simplonline into dev
App touch icon added