.idea PHPStorm folder added to .gitignore
Phing build
Customised User entitity
New models imported from DB
merge from master