Merge branch 'master' into dev

diff --cc teleforma/views/crfpa.py
index 4c4a1bfe51cb3cb5817d89b0dd54451d82879640,9bd7bcfd07cf256fdbdc3634f696efd19795e2bf..90ea5bd5dc450da67834220775baa9c74d3e3bd0
--- 1/teleforma/views/crfpa.py
--- 2/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@@ -242,8 -242,8 +242,8 @@@ class UserXLSBook(object)
                  student = Student.objects.get(user=user)
                  if profile:
                      profile = Profile.objects.get(user=user)
-                     row.write(10, profile.address_detail)
--                    row.write(11, profile.address)
 -                    row.write(10, profile.address_detail)
++                    row.write(10, profile.address)
++                    row.write(11, profile.address_detail)
                      row.write(12, profile.postal_code)
                      row.write(13, profile.city)
                      row.write(14, profile.telephone)