merge
merged
Merge branch 'dev' of https://github.com/dwoodard/MediaCloud into dev
rm bower hammer jquery