pre merge commit
merge from upstream master
refactored flash and beer view