update 1.5

changed some icons
fixed some bugs
update 1.51

missed some files
resolve conflict

Conflicts:
	src/story/Story.java
Merge branch 'master' of https://github.com/Madokami/Magibomb