merge upstream
Merge branch 'master' into feature/dinkly_phpunit_test
Merge branch 'feature/dinkly_phpunit_test'
began to add php doc to core
php doc DinklyDataConfig
more core php doc
working on DinklyBase php doc
finished php doc on DinklyBase
php doc on builder
finished phpdoc on core classes
php doc finished on adminuser class
added doc to admin user class
Merge branch 'master' of ssh://github.com/lewsid/dinkly
php doc on all admin controllers
fixed merge conflicts from upstream merge
Merge pull request #22 from ScottConnor-BHG/master

Finished php documentation and built most of the php unit tests