Merge branch 'master' of https://github.com/onepf/AppDF
minor changes
Merge branch 'master' of https://github.com/onepf/AppDF
Fix JSON from store_categories.json
Merge branch 'json_fix'
Add support for PHP <5.3 (in ParseException)
Merge branch 'php_5_2_support'
Allow Parser to use local resources (instead of downloading on each usage)
bug fixing in local data file usage
Merge branch 'master' of https://github.com/onepf/AppDF

Conflicts:
	specification/data/store_categories.json
gitignore changes
Fix package attribute created by editor
Merge branch 'editor-fix'
Merge branch 'master' of https://github.com/onepf/AppDF
Update SlideME categories
Merge pull request #167 from slidemedev/master

Updated SlideME store categories