Merge pull request #21 from Kagetsuki/master

various WIP and added emoji
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'nazuki/master'
re-arranged assets
Merge remote-tracking branch 'kagetsuki/master'

Conflicts:
	app/assets/images/poe/svg/jumping_spider_green.svg
	lib/images/svg/jumping_spider.svg
	lib/images/svg/jumping_spider_green.svg