Fix Kproj that cause VS loading issue

Remove a few extra merge lines
Adding Query capability
also adding some test data for testing.
Merge branch 'dev' of github.com:aspnetvnexthackathon/TFSOnline into dev

Conflicts:
	src/TFSOnline/TFSOnline.kproj
Merge pull request #6 from aspnetvnexthackathon/dev

Merge Kproj change to Master