To delete
Fixed conflict at .htaccess
Merge branch '159' of https://github.com/nsclick/inalco into 159