added crime type addtition logic
Merge remote-tracking branch 'origin/master'

Conflicts:
	iDeloR&I/js/app.js
merged app.js
Merge remote-tracking branch 'origin/master'