fix issuie
Merge branch 'master' of github.com:xblaster/wadManager2

Conflicts:
	lib/controllers/entry.js