update gemfile.lock
assets precompile
Merge branch 'development' of github.com:shoopoon/pharmkon into development