Api and ApiImpl All Completed
Some Small Changes
add
add
Merge remote-tracking branch 'origin/smafjal' into smafjal

Conflicts:
	.gitignore