controllers cleaned
Merge branch 'development' of github.com:joshua5201/tioj into development