Create buttonPanel.java
update
Delete buttonPanel.java
Merge branch 'master' into 20141214_1537

Conflicts:
	AdventureGame/src/GUI/ButtonPanel.java
rename buttons
Merge branch '20141214_1537'