more advanced popup
Merge branch 'master' of github.com:monsterboxpro/monster-javascripts

Conflicts:
	app/assets/javascripts/monster/list.coffee