change database name (name=blog_engine)
database name changed
Merge origin/master

Conflicts:
	New Folder/WAMP_blog_engine/src/main/webapp/META-INF/context.xml
	New Folder/WAMP_blog_engine/src/main/webapp/WEB-INF/web.xml