lots of shit
this causes me a little bit of headche, so fuck it
Merge branch 'master' into jqm
added a few buttons to do things
Merge branch 'master' into jqm