Compiling
Merge branch 'development' into integration

Conflicts:
	public/assets/application-767ea4478c6d5143f6a4ff943daae0fa.css.gz
	public/assets/application-dd6d7c0f66ae2a4da6e73a09a9d73cef.js.gz
	public/assets/application.css.gz
	public/assets/application.js.gz
	public/assets/bootstrap-affix-e840cb0e2d78e94aaac35475d9579b7c.js.gz
	public/assets/bootstrap-affix.js.gz
	public/assets/bootstrap-alert-6b739a35cbdb182b231a1bc06dc47f1f.js.gz
	public/assets/bootstrap-alert.js.gz
	public/assets/bootstrap-b0095fa850f0b646099dbc577e833369.js.gz
	public/assets/bootstrap-button-e1b97be251358d9618cf099228de3fa3.js.gz
	public/assets/bootstrap-button.js.gz
	public/assets/bootstrap-carousel-4d6b69ce7849e7d14ecd68fb6c3aec41.js.gz
	public/assets/bootstrap-carousel.js.gz
	public/assets/bootstrap-collapse-e59278132895d8fa46bc9edd6f4108bc.js.gz
	public/assets/bootstrap-collapse.js.gz
	public/assets/bootstrap-dd81f9018c4cdcc6609121656a35bcbb.css.gz
	public/assets/bootstrap-dropdown-83e7e048604b84f0f2a61f93a88c5a18.js.gz
	public/assets/bootstrap-dropdown.js.gz
	public/assets/bootstrap-modal-af7c2034cb4e248052b4cf871e928604.js.gz
	public/assets/bootstrap-modal.js.gz
	public/assets/bootstrap-popover-65fbf5a52d0bdb17ae04a2ccbd9e55fe.js.gz
	public/assets/bootstrap-popover.js.gz
	public/assets/bootstrap-responsive-e5cf33cbc4e5f6b503e1861a7b2c5dc4.css.gz
	public/assets/bootstrap-responsive.css.gz
	public/assets/bootstrap-scrollspy-4218199adcd908775a38c6ffaf6f7e67.js.gz
	public/assets/bootstrap-scrollspy.js.gz
	public/assets/bootstrap-tab-ebddae0fdce50df7dc687427118374c1.js.gz
	public/assets/bootstrap-tab.js.gz
	public/assets/bootstrap-tooltip-076f464bf92b8356e83a2d9971fa8b8a.js.gz
	public/assets/bootstrap-tooltip.js.gz
	public/assets/bootstrap-transition-f3dbb16bb3b842842af1a8fa8f858f2a.js.gz
	public/assets/bootstrap-transition.js.gz
	public/assets/bootstrap-typeahead-ba91c9951441015a29fce41a7fa40a1a.js.gz
	public/assets/bootstrap-typeahead.js.gz
	public/assets/bootstrap.css.gz
	public/assets/bootstrap.js.gz
	public/assets/bootstrap/bootstrap-dd81f9018c4cdcc6609121656a35bcbb.css.gz
	public/assets/bootstrap/bootstrap.css.gz
	public/assets/bootstrap/responsive-e5cf33cbc4e5f6b503e1861a7b2c5dc4.css.gz
	public/assets/bootstrap/responsive.css.gz
	public/assets/bootstrap_and_overrides-7d5447485ade7d994d76f4aa91c63b1d.css.gz
	public/assets/bootstrap_and_overrides.css.gz
	public/assets/coffee-script-1a951ce7c9a916d64eefa4c053b679c4.js.gz
	public/assets/coffee-script.js.gz
	public/assets/formtastic-286f929a10600826c6e007007b13118b.css.gz
	public/assets/formtastic-bootstrap-15095cd78c218fcfdddb46544551e6ad.css.gz
	public/assets/formtastic-bootstrap.css.gz
	public/assets/formtastic.css.gz
	public/assets/formtastic_ie6-5203d1014106c4a1b197311bb4dd4d17.css.gz
	public/assets/formtastic_ie6.css.gz
	public/assets/formtastic_ie7-0d7ed668ce44ba0690fb779c0ccf3ca4.css.gz
	public/assets/formtastic_ie7.css.gz
	public/assets/jquery-674c27ed60edf7bed2e2b50c728fc542.js.gz
	public/assets/jquery-ui-bootstrap-45ba545306cf9ca3fa43e1511cbaae8c.css.gz
	public/assets/jquery-ui-bootstrap-545f3e3017f9b703974761a439076cf0.js.gz
	public/assets/jquery-ui-bootstrap.css.gz
	public/assets/jquery-ui-bootstrap.ie-fa8bae7c72eee0e070a2150fa3b48145.css.gz
	public/assets/jquery-ui-bootstrap.ie.css.gz
	public/assets/jquery-ui-bootstrap.js.gz
	public/assets/jquery.js.gz
	public/assets/jquery.min-fd6b111f0b3d5d90da1f9b564be0cf63.js.gz
	public/assets/jquery.min.js.gz
	public/assets/jquery_ujs-89f122ec767157dfb527e0065c69cbd3.js.gz
	public/assets/jquery_ujs.js.gz
	public/assets/my_formtastic_changes-1b13569e9620782f423d4cd3ce931750.css.gz
	public/assets/my_formtastic_changes.css.gz
	public/assets/twitter-bootstrap-static/bootstrap-c679f1e7e7f8e8eca83ac9f441171b20.css.gz
	public/assets/twitter-bootstrap-static/bootstrap.css.gz
	public/assets/twitter-bootstrap-static/fontawesome-ce05f3b9f757811c37f09c4f81a2ceaa.css.gz
	public/assets/twitter-bootstrap-static/fontawesome.css.gz
	public/assets/twitter-bootstrap-static/sprites-622d4146d665095f89f1956c0c481dfe.css.gz
	public/assets/twitter-bootstrap-static/sprites.css.gz
	public/assets/twitter/bootstrap-3cf542bdf3cafa0649a0f543bddcac01.js.gz
	public/assets/twitter/bootstrap-56385a9a14386d07b1fada886cf1fbd2.css.gz
	public/assets/twitter/bootstrap-no-sprites-4d346ccfaad9e847fa6c7bb4320259cc.css.gz
	public/assets/twitter/bootstrap-no-sprites.css.gz
	public/assets/twitter/bootstrap.css.gz
	public/assets/twitter/bootstrap.js.gz
	public/assets/twitter/bootstrap/affix-55da736d7fdeb08777626474958886cb.js.gz
	public/assets/twitter/bootstrap/affix.js.gz
	public/assets/twitter/bootstrap/alert-607b32dfeaef5feaf8231b01204d76ae.js.gz
	public/assets/twitter/bootstrap/alert.js.gz
	public/assets/twitter/bootstrap/bootstrap-affix-e840cb0e2d78e94aaac35475d9579b7c.js.gz
	public/assets/twitter/bootstrap/bootstrap-affix.js.gz
	public/assets/twitter/bootstrap/bootstrap-alert-6b739a35cbdb182b231a1bc06dc47f1f.js.gz
	public/assets/twitter/bootstrap/bootstrap-alert.js.gz
	public/assets/twitter/bootstrap/bootstrap-button-e1b97be251358d9618cf099228de3fa3.js.gz
	public/assets/twitter/bootstrap/bootstrap-button.js.gz
	public/assets/twitter/bootstrap/bootstrap-carousel-4d6b69ce7849e7d14ecd68fb6c3aec41.js.gz
	public/assets/twitter/bootstrap/bootstrap-carousel.js.gz
	public/assets/twitter/bootstrap/bootstrap-collapse-e59278132895d8fa46bc9edd6f4108bc.js.gz
	public/assets/twitter/bootstrap/bootstrap-collapse.js.gz
	public/assets/twitter/bootstrap/bootstrap-dropdown-83e7e048604b84f0f2a61f93a88c5a18.js.gz
	public/assets/twitter/bootstrap/bootstrap-dropdown.js.gz
	public/assets/twitter/bootstrap/bootstrap-modal-af7c2034cb4e248052b4cf871e928604.js.gz
	public/assets/twitter/bootstrap/bootstrap-modal.js.gz
	public/assets/twitter/bootstrap/bootstrap-popover-65fbf5a52d0bdb17ae04a2ccbd9e55fe.js.gz
	public/assets/twitter/bootstrap/bootstrap-popover.js.gz
	public/assets/twitter/bootstrap/bootstrap-scrollspy-4218199adcd908775a38c6ffaf6f7e67.js.gz
	public/assets/twitter/bootstrap/bootstrap-scrollspy.js.gz
	public/assets/twitter/bootstrap/bootstrap-tab-ebddae0fdce50df7dc687427118374c1.js.gz
	public/assets/twitter/bootstrap/bootstrap-tab.js.gz
	public/assets/twitter/bootstrap/bootstrap-tooltip-076f464bf92b8356e83a2d9971fa8b8a.js.gz
	public/assets/twitter/bootstrap/bootstrap-tooltip.js.gz
	public/assets/twitter/bootstrap/bootstrap-transition-f3dbb16bb3b842842af1a8fa8f858f2a.js.gz
	public/assets/twitter/bootstrap/bootstrap-transition.js.gz
	public/assets/twitter/bootstrap/bootstrap-typeahead-ba91c9951441015a29fce41a7fa40a1a.js.gz
	public/assets/twitter/bootstrap/bootstrap-typeahead.js.gz
	public/assets/twitter/bootstrap/button-7f58000c910e551d919f1e21fd2b97d2.js.gz
	public/assets/twitter/bootstrap/button.js.gz
	public/assets/twitter/bootstrap/carousel-09758239237686e86b6e12b6f0e9f11c.js.gz
	public/assets/twitter/bootstrap/carousel.js.gz
	public/assets/twitter/bootstrap/collapse-cb78a9eb97c27b358c5effeb245528cd.js.gz
	public/assets/twitter/bootstrap/collapse.js.gz
	public/assets/twitter/bootstrap/dropdown-23e79a3398aa82dba5e3ed1d139a6032.js.gz
	public/assets/twitter/bootstrap/dropdown.js.gz
	public/assets/twitter/bootstrap/modal-2d0b81d3dec8464328d3a53081886925.js.gz
	public/assets/twitter/bootstrap/modal.js.gz
	public/assets/twitter/bootstrap/popover-f0319f9354479b4ebe17ed0dba436c67.js.gz
	public/assets/twitter/bootstrap/popover.js.gz
	public/assets/twitter/bootstrap/scrollspy-a9eb3aa2185c7fd764d5407e0375af42.js.gz
	public/assets/twitter/bootstrap/scrollspy.js.gz
	public/assets/twitter/bootstrap/tab-09966f78915c9732a62d445b52f64eb2.js.gz
	public/assets/twitter/bootstrap/tab.js.gz
	public/assets/twitter/bootstrap/tooltip-2efdc504c733f3c66721f2267124f285.js.gz
	public/assets/twitter/bootstrap/tooltip.js.gz
	public/assets/twitter/bootstrap/transition-f6432d84c5965baf2ec74839424047c7.js.gz
	public/assets/twitter/bootstrap/transition.js.gz
	public/assets/twitter/bootstrap/typeahead-4f04957f8b5809cba3abe0cad330d115.js.gz
	public/assets/twitter/bootstrap/typeahead.js.gz
	public/assets/twitter/bootstrap_ujs-d44501d3b34e9474e1146dc0a3ff4c44.js.gz
	public/assets/twitter/bootstrap_ujs.js.gz
Compiling
Merge branch 'development' into integration
Merge branch 'development' into integration
Merge branch 'development' into integration
Merge branch 'development' into integration
Merge branch 'development' into integration
Create .travis.yml
Assets precompiled
Merge branch 'integration' of github.com:Treize37/convergences into integration

Conflicts:
	public/assets/application-767ea4478c6d5143f6a4ff943daae0fa.css.gz
	public/assets/application-dd6d7c0f66ae2a4da6e73a09a9d73cef.js.gz
	public/assets/application.css.gz
	public/assets/application.js.gz
	public/assets/bootstrap-affix-e840cb0e2d78e94aaac35475d9579b7c.js.gz
	public/assets/bootstrap-affix.js.gz
	public/assets/bootstrap-alert-6b739a35cbdb182b231a1bc06dc47f1f.js.gz
	public/assets/bootstrap-alert.js.gz
	public/assets/bootstrap-b0095fa850f0b646099dbc577e833369.js.gz
	public/assets/bootstrap-button-e1b97be251358d9618cf099228de3fa3.js.gz
	public/assets/bootstrap-button.js.gz
	public/assets/bootstrap-carousel-4d6b69ce7849e7d14ecd68fb6c3aec41.js.gz
	public/assets/bootstrap-carousel.js.gz
	public/assets/bootstrap-collapse-e59278132895d8fa46bc9edd6f4108bc.js.gz
	public/assets/bootstrap-collapse.js.gz
	public/assets/bootstrap-dd81f9018c4cdcc6609121656a35bcbb.css.gz
	public/assets/bootstrap-dropdown-83e7e048604b84f0f2a61f93a88c5a18.js.gz
	public/assets/bootstrap-dropdown.js.gz
	public/assets/bootstrap-modal-af7c2034cb4e248052b4cf871e928604.js.gz
	public/assets/bootstrap-modal.js.gz
	public/assets/bootstrap-popover-65fbf5a52d0bdb17ae04a2ccbd9e55fe.js.gz
	public/assets/bootstrap-popover.js.gz
	public/assets/bootstrap-responsive-e5cf33cbc4e5f6b503e1861a7b2c5dc4.css.gz
	public/assets/bootstrap-responsive.css.gz
	public/assets/bootstrap-scrollspy-4218199adcd908775a38c6ffaf6f7e67.js.gz
	public/assets/bootstrap-scrollspy.js.gz
	public/assets/bootstrap-tab-ebddae0fdce50df7dc687427118374c1.js.gz
	public/assets/bootstrap-tab.js.gz
	public/assets/bootstrap-tooltip-076f464bf92b8356e83a2d9971fa8b8a.js.gz
	public/assets/bootstrap-tooltip.js.gz
	public/assets/bootstrap-transition-f3dbb16bb3b842842af1a8fa8f858f2a.js.gz
	public/assets/bootstrap-transition.js.gz
	public/assets/bootstrap-typeahead-ba91c9951441015a29fce41a7fa40a1a.js.gz
	public/assets/bootstrap-typeahead.js.gz
	public/assets/bootstrap.css.gz
	public/assets/bootstrap.js.gz
	public/assets/bootstrap/bootstrap-dd81f9018c4cdcc6609121656a35bcbb.css.gz
	public/assets/bootstrap/bootstrap.css.gz
	public/assets/bootstrap/responsive-e5cf33cbc4e5f6b503e1861a7b2c5dc4.css.gz
	public/assets/bootstrap/responsive.css.gz
	public/assets/bootstrap_and_overrides-7d5447485ade7d994d76f4aa91c63b1d.css.gz
	public/assets/bootstrap_and_overrides.css.gz
	public/assets/coffee-script-1a951ce7c9a916d64eefa4c053b679c4.js.gz
	public/assets/coffee-script.js.gz
	public/assets/formtastic-286f929a10600826c6e007007b13118b.css.gz
	public/assets/formtastic-bootstrap-15095cd78c218fcfdddb46544551e6ad.css.gz
	public/assets/formtastic-bootstrap.css.gz
	public/assets/formtastic.css.gz
	public/assets/formtastic_ie6-5203d1014106c4a1b197311bb4dd4d17.css.gz
	public/assets/formtastic_ie6.css.gz
	public/assets/formtastic_ie7-0d7ed668ce44ba0690fb779c0ccf3ca4.css.gz
	public/assets/formtastic_ie7.css.gz
	public/assets/jquery-674c27ed60edf7bed2e2b50c728fc542.js.gz
	public/assets/jquery-ui-bootstrap-45ba545306cf9ca3fa43e1511cbaae8c.css.gz
	public/assets/jquery-ui-bootstrap-545f3e3017f9b703974761a439076cf0.js.gz
	public/assets/jquery-ui-bootstrap.css.gz
	public/assets/jquery-ui-bootstrap.ie-fa8bae7c72eee0e070a2150fa3b48145.css.gz
	public/assets/jquery-ui-bootstrap.ie.css.gz
	public/assets/jquery-ui-bootstrap.js.gz
	public/assets/jquery.js.gz
	public/assets/jquery.min-fd6b111f0b3d5d90da1f9b564be0cf63.js.gz
	public/assets/jquery.min.js.gz
	public/assets/jquery_ujs-89f122ec767157dfb527e0065c69cbd3.js.gz
	public/assets/jquery_ujs.js.gz
	public/assets/my_formtastic_changes-1b13569e9620782f423d4cd3ce931750.css.gz
	public/assets/my_formtastic_changes.css.gz
	public/assets/twitter-bootstrap-static/bootstrap-c679f1e7e7f8e8eca83ac9f441171b20.css.gz
	public/assets/twitter-bootstrap-static/bootstrap.css.gz
	public/assets/twitter-bootstrap-static/fontawesome-ce05f3b9f757811c37f09c4f81a2ceaa.css.gz
	public/assets/twitter-bootstrap-static/fontawesome.css.gz
	public/assets/twitter-bootstrap-static/sprites-622d4146d665095f89f1956c0c481dfe.css.gz
	public/assets/twitter-bootstrap-static/sprites.css.gz
	public/assets/twitter/bootstrap-3cf542bdf3cafa0649a0f543bddcac01.js.gz
	public/assets/twitter/bootstrap-56385a9a14386d07b1fada886cf1fbd2.css.gz
	public/assets/twitter/bootstrap-no-sprites-4d346ccfaad9e847fa6c7bb4320259cc.css.gz
	public/assets/twitter/bootstrap-no-sprites.css.gz
	public/assets/twitter/bootstrap.css.gz
	public/assets/twitter/bootstrap.js.gz
	public/assets/twitter/bootstrap/affix-55da736d7fdeb08777626474958886cb.js.gz
	public/assets/twitter/bootstrap/affix.js.gz
	public/assets/twitter/bootstrap/alert-607b32dfeaef5feaf8231b01204d76ae.js.gz
	public/assets/twitter/bootstrap/alert.js.gz
	public/assets/twitter/bootstrap/bootstrap-affix-e840cb0e2d78e94aaac35475d9579b7c.js.gz
	public/assets/twitter/bootstrap/bootstrap-affix.js.gz
	public/assets/twitter/bootstrap/bootstrap-alert-6b739a35cbdb182b231a1bc06dc47f1f.js.gz
	public/assets/twitter/bootstrap/bootstrap-alert.js.gz
	public/assets/twitter/bootstrap/bootstrap-button-e1b97be251358d9618cf099228de3fa3.js.gz
	public/assets/twitter/bootstrap/bootstrap-button.js.gz
	public/assets/twitter/bootstrap/bootstrap-carousel-4d6b69ce7849e7d14ecd68fb6c3aec41.js.gz
	public/assets/twitter/bootstrap/bootstrap-carousel.js.gz
	public/assets/twitter/bootstrap/bootstrap-collapse-e59278132895d8fa46bc9edd6f4108bc.js.gz
	public/assets/twitter/bootstrap/bootstrap-collapse.js.gz
	public/assets/twitter/bootstrap/bootstrap-dropdown-83e7e048604b84f0f2a61f93a88c5a18.js.gz
	public/assets/twitter/bootstrap/bootstrap-dropdown.js.gz
	public/assets/twitter/bootstrap/bootstrap-modal-af7c2034cb4e248052b4cf871e928604.js.gz
	public/assets/twitter/bootstrap/bootstrap-modal.js.gz
	public/assets/twitter/bootstrap/bootstrap-popover-65fbf5a52d0bdb17ae04a2ccbd9e55fe.js.gz
	public/assets/twitter/bootstrap/bootstrap-popover.js.gz
	public/assets/twitter/bootstrap/bootstrap-scrollspy-4218199adcd908775a38c6ffaf6f7e67.js.gz
	public/assets/twitter/bootstrap/bootstrap-scrollspy.js.gz
	public/assets/twitter/bootstrap/bootstrap-tab-ebddae0fdce50df7dc687427118374c1.js.gz
	public/assets/twitter/bootstrap/bootstrap-tab.js.gz
	public/assets/twitter/bootstrap/bootstrap-tooltip-076f464bf92b8356e83a2d9971fa8b8a.js.gz
	public/assets/twitter/bootstrap/bootstrap-tooltip.js.gz
	public/assets/twitter/bootstrap/bootstrap-transition-f3dbb16bb3b842842af1a8fa8f858f2a.js.gz
	public/assets/twitter/bootstrap/bootstrap-transition.js.gz
	public/assets/twitter/bootstrap/bootstrap-typeahead-ba91c9951441015a29fce41a7fa40a1a.js.gz
	public/assets/twitter/bootstrap/bootstrap-typeahead.js.gz
	public/assets/twitter/bootstrap/button-7f58000c910e551d919f1e21fd2b97d2.js.gz
	public/assets/twitter/bootstrap/button.js.gz
	public/assets/twitter/bootstrap/carousel-09758239237686e86b6e12b6f0e9f11c.js.gz
	public/assets/twitter/bootstrap/carousel.js.gz
	public/assets/twitter/bootstrap/collapse-cb78a9eb97c27b358c5effeb245528cd.js.gz
	public/assets/twitter/bootstrap/collapse.js.gz
	public/assets/twitter/bootstrap/dropdown-23e79a3398aa82dba5e3ed1d139a6032.js.gz
	public/assets/twitter/bootstrap/dropdown.js.gz
	public/assets/twitter/bootstrap/modal-2d0b81d3dec8464328d3a53081886925.js.gz
	public/assets/twitter/bootstrap/modal.js.gz
	public/assets/twitter/bootstrap/popover-f0319f9354479b4ebe17ed0dba436c67.js.gz
	public/assets/twitter/bootstrap/popover.js.gz
	public/assets/twitter/bootstrap/scrollspy-a9eb3aa2185c7fd764d5407e0375af42.js.gz
	public/assets/twitter/bootstrap/scrollspy.js.gz
	public/assets/twitter/bootstrap/tab-09966f78915c9732a62d445b52f64eb2.js.gz
	public/assets/twitter/bootstrap/tab.js.gz
	public/assets/twitter/bootstrap/tooltip-2efdc504c733f3c66721f2267124f285.js.gz
	public/assets/twitter/bootstrap/tooltip.js.gz
	public/assets/twitter/bootstrap/transition-f6432d84c5965baf2ec74839424047c7.js.gz
	public/assets/twitter/bootstrap/transition.js.gz
	public/assets/twitter/bootstrap/typeahead-4f04957f8b5809cba3abe0cad330d115.js.gz
	public/assets/twitter/bootstrap/typeahead.js.gz
	public/assets/twitter/bootstrap_ujs-d44501d3b34e9474e1146dc0a3ff4c44.js.gz
	public/assets/twitter/bootstrap_ujs.js.gz
	tmp/cache/assets/CF0/DA0/sprockets%2Fd7d5b37686831d37c4dd75e645f5e016
	tmp/cache/assets/E25/4C0/sprockets%2Fde2fd9fd11c04a582cdbbe3d84a35ae6
Assets precompiled
HTML to HAML
HTML to HAML
French application locale added
Devise is configured for sending mail
Sendgrid added into production config
reset password instruction in french
deleting precompiled assets