Version was changed to 2.0-SNAPSHOT
minor fix for .gitignore
Merge pull request #1791 from SciSpike/develop

minor fix for .gitignore
Merge branch 'develop' of https://github.com/orientechnologies/orientdb into hotfix-1.6.1
Updated version to 1.6.1-SNAPSHOT
Merge branch 'hotfix-1.6.1' of https://github.com/orientechnologies/orientdb into hotfix-1.6.1
Fix exception type when record is duplicated
(cherry picked from commit a92addf)
Merge remote-tracking branch 'nuvolabase/hotfix-1.6.1' into hotfix-1.6.1
Minor: new script to fix Eclipse IDE crazyness after pom.xml has been updated
Merge branch 'hotfix-1.6.1' of https://github.com/orientechnologies/orientdb into hotfix-1.6.1
Removed tons of warnings
Fixed  issue #1776
Minor: fixed warnings and nasty \n on db import
SQL new sql function "document" to create a document at the fly. This is neede by last patch that automatically creates a collection of items when a sub select is executed (smart!)
Incremented JVM heap on tests to 2GB
Merge branch 'orienttechnologies/hotfix-1.6.1'