Unneeded code
New Action and a bit of picking up palace cards
More palace stuff
Merge branch 'controller' into mauricio

Conflicts:
	src/Controllers/BoardController.java
Merge branch 'mauricio' into controller