dev 1 day update
dev day 1 v2 update

Conflicts:
	config_manager/config.py
dev day 2 v1 update
Merge pull request #2 from shaon/dev_shaon

Dev shaon