Merge branch 'master' of https://github.com/Kisung/blaws-bd

Conflicts:
	.gitignore
	blaws/__init__.py
	blaws/blaws_config.py
	blaws/blaws_logger.py
	blaws/controller/__init__.py
	blaws/model/instanceshistory.py
Merge branch 'master' of https://github.com/Kisung/blaws-bd

Conflicts:
	.gitignore
	blaws/__init__.py
	blaws/blaws_config.py
	blaws/blaws_logger.py
	blaws/controller/__init__.py
	blaws/model/instanceshistory.py