v1.2
Mindre ändring i functions.js
Merge branch 'dev'