Merge pull request #1 from DevJohan/master

Frontend working area.
Fixing js property list bug
Merge pull request #1 from makerspace/master

Fixing errors with property lists