Admin shops add stock
Fixed admin shop NPC image upload closes #169
Removed tmp directory from assets/img/npc/shop
Fixed creating shops
Fixed inventory error when item cannot be used
Add documentation for helpers
Documentation #103
Documentation #103
Documentation - remove routing as Kohana has same information
Documentation - Expressive Views
Documentation - Expressive View
Missing semi colon - Documentation
Documentation
Use img function for npc image
Rename assets/img to media/image
Make pet view use model function
Merge branch 'feature/assets-refactor' into feature/asset-refactor

Conflicts:
	assets/img/glyphicons-halflings-white.png
	assets/img/glyphicons-halflings.png
	media/image/glyphicons-halflings-white.png
	media/image/glyphicons-halflings.png
	modulargaming/core/assets/img/glyphicons-halflings-white.png
	modulargaming/core/assets/img/glyphicons-halflings.png
Merge branch 'feature/assets-refactor' into feature/asset-refactor