time zone
Readme update
Don't delete .gitkeep file in cache directory
Merge pull request #461 from maxailloud/master

Don't delete .gitkeep file in cache directory
Merge remote-tracking branch 'upstream/master'
Renamed composer.dist.json to a more standard composer.json.dist

See : http://stackoverflow.com/questions/16843080/what-does-dist-used-as-an-extension-of-some-source-code-file-means
Added forgotton file and readme update
Updated travis conf
Merge pull request #462 from purplefish32/renamecomposerjson

Renamed composer.dist.json to a more standard composer.json.dist
Added required extension
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
Delete old logos
keepfiles
gitkeep
Readme update
Readme update
readme update
Merge pull request #488 from solispauwels/master

Delete old logos
Removed placeholders in generated folders
Removed remaining placeholders and bumped versions