sort out things
Work on plans & report controller
Merge branch 'master' of https://github.com/rghorbani/IE-Project