Uncommented form alter. Added check if user is not admin
Merge branch 'development' of github.com:ding2tal/bpi into development