.settings added to avoid errors
Merge branch 'master' of https://github.com/apurvatn/adrater

Conflicts:
	adrater/.settings/org.eclipse.wst.common.component
Merge branch 'master' of https://github.com/apurvatn/adrater.git

Conflicts:
	adrater/.classpath
Merge branch 'master' of https://github.com/apurvatn/adrater