commit to reset HEAD
added all files from local repo
added missing j2me and test files
removed .hgtags from gitignore
actually changed .gitignore
fixed merge conflict