Removed mockup.htm
Added genericons license
Fixed several bugs and upgraded to 1.6