changed icons to test
render
merge from master
change red icon to x again, and grey info icon to asterisk
replace alert() with console.log() to never show pop-ups to people
Merge remote-tracking branch 'origin/gh-pages'
Merge remote-tracking branch 'origin/gh-pages'