pre=pol merge
Merge branch 'master' of https://github.com/seavor/fatapp into jay

Conflicts:
	js/jquery.js
Merge branch 'master' of https://github.com/seavor/fatapp into jay
more cleanup, premerge
pre-php refactor
Merge pull request #4 from seavor/polina

Polina
Merge branch 'master' of https://github.com/seavor/fatapp into jay
Merge pull request #5 from seavor/jay

Jay