Update README.markdown
Update README.markdown
Merge branch 'develop' of github.com:Surt/Granada

Conflicts:
	README.markdown
Readme for version 1.5
Readme for version 1.5
Merge branch 'master' of github.com:Surt/Granada
Merge branch 'master' of github.com:Surt/Granada
Merge branch 'master' of github.com:Surt/Granada
composer version update
composer version update
Merge pull request #25 from Surt/develop

Delete error_log
Update README.markdown
Update README.markdown
delete composer vendor.
Merge branch 'master' of github.com:Surt/Granada

Conflicts:
	composer.json
Merge pull request #26 from Surt/master

develop updated to 1.5