Modification of the EventManager + Log to work with PHP 5.3
Update phpdoc
Updated ant build file
Merge remote-tracking branch 'upstream/master'
Moved build config to dev folder + added placeholders for build dir
Added placeholders in cache and logs dirs
Renamed placeholders to .gitkeep and added placeholders in required dirs
Fixed ant base dir path
Fixed ant base dir path (2)
Fixed ant base dir path (3)
Excluded frontend bundle from jshint linting
Fixed ant config
Merge pull request #333 from stefk/master

Fixed build configuration
Fixed build configuration
Merge remote-tracking branch 'upstream/master'
Fixed .jshintignore
Removed composer.lock
Missing double quotes
Merge pull request #342 from purplefish32/patch-1

Missing double quotes
Linked to new setting checker