Trying to create a branch for the 1 July release
* moved maintenance and productivity cost out of risk modules
* decorated score frame
* multiple risks supported
* refactored simulation: cost calculated per policy, several types of risks with datasets generated from incidents (see wiki/Risk-and-Cost)
* implemented incidents read from json files
* models.pw_policy is also a standalone application can generates training data from json incident description
* refactored policy2datapoint to policy model
* removed third score from interface: now displaying only risk and cost
generated data files with game content
Merge remote-tracking branch 'origin/demonstrator-1july' into master-real

Conflicts:
	controllers/login.py
	controllers/pwpolicy.py
	main.py
	models/incident.py
	models/pw_policy.py
	static/css/bootstrap.css
	static/incidents/default.json
	static/incidents/easy_recovery.json
	static/incidents/easy_secure.json
	static/incidents/eternal.json
	static/incidents/hard_secure.json
	static/incidents/too_hard.json
	static/incidents/too_often.json
	static/incidents/very_easy.json
	static/js/pwpolicy.js
	views/index_private.html
Merge remote-tracking branch 'origin/master' into master-real
Merge remote-tracking branch 'origin/master' into master-real

Conflicts:
	controllers/pwpolicy.py
Merge remote-tracking branch 'origin/master' into master-real
Merge remote-tracking branch 'origin/master' into master-real
Merge remote-tracking branch 'origin/master' into master-real