Sammi 20141101
Sammi 20141101
Merge remote-tracking branch 'origin/master'

Conflicts:
	file_data/data/open_api_file/6_execute_hcm_sql.json
	file_data/index/open_api_index/open_api_index.json
Merge remote-tracking branch 'origin/master'
Sammi 20141101
Merge remote-tracking branch 'origin/master'

Conflicts:
	file_data/index/open_api_index/open_api_index.json
Sammi 20141101