update cancan and alert message
Merge branch 'master' of github.com:prashant1988/blorgh-