Htaccess removed
Merge branch 'master' of ssh://archallenge.es/~/sensarch_dev/dev
hotfix
a
Edit profile page
Merge branch 'editProfilePage'