runtime
Merge branch 'master' of https://github.com/ryanbayuadji/inventory

Conflicts:
	protected/runtime/application.log