Initial commit
added eclipse project files
Merge remote-tracking branch 'upstream/master'