Merge branch 'master' of https://github.com/Odingod/Spaceapps
Merge branch 'master' of https://github.com/Odingod/Spaceapps

Conflicts:
	static/js/formrenderer.js
Merge branch 'master' of https://github.com/Odingod/Spaceapps
Merge branch 'master' of https://github.com/Odingod/Spaceapps

Conflicts:
	static/js/formrenderer.js

Signed-off-by: Heikki Pulkkinen <heikki.j.pulkkinen@gmail.com>
Merge branch 'master' of https://github.com/Odingod/Spaceapps