Merge branch 'master' into development
added controllers, added suggestions
import controllers in routes
Merge branch 'development'