Ignore PHPStorm project files
introduce CMS version constant
gitignore file
resolve gitignore conflict
introduce cache_version system variable
assets versioning
increase cache number on clearing the cache
merge master into 3.3