Merge branch 'master' of https://github.com/rjeans/core

git-svn-id: http://localhost/svn/core/core/trunk@25 88ec9e9a-694c-41cc-b543-b5cda355a820
gitignore

git-svn-id: http://localhost/svn/core/core/trunk@26 88ec9e9a-694c-41cc-b543-b5cda355a820
Merge branch 'master' of https://github.com/rjeans/core