removed .idae folder
Merge branch 'master' of github.com:erp-lsf/ira_site
Added misc. controller
Merge branch 'Testing'