fixing asset paths for installer
updated the sample config file
Merge pull request #24 from cnlpete/development

[3.1] Development
Merge pull request #26 from marcoraddatz/master

3.0 -> 3.1
Merge pull request #27 from marcoraddatz/master

3.0 -> 3.1
fixing the installer
added published flag to gallery albums
Merge pull request #28 from cnlpete/development

Development
Merge branch '3.0' into 3.1
Merge branch '3.0' into 3.1
Merge branch '3.0' into 3.1
updated sample config
only load candy 3.1.x packages
Merge branch 'master' into 3.1
Updated read me
Updated TinyMCE to Version 4
Providing some update information
Merge branch 'master' into 3.1

Conflicts:
	README.md
Updated composer with new packages
Updated migrations and corrected SQL Error