pass jshint
add really popup system
merge