updated doctrine integration
Merge branch 'develop'
Added composer lock to ignor list
Merge branch 'develop'
Merge branch 'master' of https://github.com/jibaomansaray/AlicePHP

Conflicts:
	.gitignore
	Framework/Alicephp/composer.lock
Merge branch 'develop'
Merge branch 'develop'
added json feature  to configuration class
Merge branch 'master' of https://github.com/jibaomansaray/AlicePHP
fixed a bug in the site url
fixed a bug in the view class