commit 15
Merge branch 'master' of https://github.com/stbyrne/pfai

Conflicts:
	www/css/index.css
	www/js/index.js
	www/services/js/images/icons-36-black.png