Merge pull request #77 from MrHash/master

Enhancement of ElasticSearch support, SearchManager, and Serialization
placed annotations in seperate files for better readability and easier autoloading
removed some weird $id$ tags in the license comments
Merge pull request #81 from teuneboon/master

placed annotations in seperate files for better readability and easier autoloading
Merge branch 'master' of https://github.com/doctrine/search

Conflicts:
	lib/Doctrine/Search/Mapping/Annotations/ElasticSearchable.php
Merge branch 'master' into core_integration

Conflicts:
	lib/Doctrine/Search/Mapping/Annotations/ElasticSearchable.php