Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/js/app.js

bin/afterUpdate.sh

@@ -11,8 +11,6 @@ rm -rf src/scss/lib
 mkdir -p src/js/lib/
 mkdir -p src/scss/lib/
 
-
-
 for d in "vendor/ainias/pwa"*/; do
 
     find $d$jsSourceDir -name '*.js' -exec cp -r '{}' src/js/lib/ \;