API updates
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from TheGamersCave/master

Basis for data.php which will save / load widget data in compiance for t...
update
Merge remote-tracking branch 'upstream/master'
removed stuff
new
Prepping for another merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/widgrid.js
Stashed changes