remove override
adjust html for player picture
Player can no longer roll dice if he is in prison.
remove jpg pictures
add picture of profs
refactor css
add functionality to move player.
extend the functionality to leave the prison by paying money.
extend the functionality to leave the prison by use of a Prison free ticket .
refactor prison functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/assets/js/main.js
	app/controllers/Application.java
	app/views/index.scala.html
merge
without angular js