buttonPanel

create Buttons
Delete buttonPanel
Update MainFrame.java
buttonPanel

creates Buttons
Update MainFrame.java
Update MainFrame.java
Update MainFrame.java
-update
-update
-merged with patch 1
add buttonPanel
merged with patch1
-rename buttons
Merge branch 'master' into 20141214_1537

Conflicts:
	AdventureGame/src/GUI/ButtonPanel.java