PSR coding standards
PSR coding standards
Added IntellijIDEA IDE to gitignore
PHP strict mode compat
Merge branch 'master' into develop

Conflicts:
	core/modules/modMyModule.class.php
	lib/mymodule.lib.php
Merge branch 'master' into develop
Merge remote-tracking branch 'origin/markdown-up' into develop
Synced gitattributes
Merge branch '3.2' into develop

Conflicts:
	core/modules/modMyModule.class.php
	lib/mymodule.lib.php
Merge branch 'develop'