25.06.14 12/46 alex b
Delete .gitignore
add dao  first time   14.13
git ignore
gitignore
merging
gitignore
Merge remote-tracking branch 'origin/DeveloperDAO'

Conflicts:
	SearchAndSee/.classpath
	SearchAndSee/src/main/java/com/seavus/sas/dao/FilmDao.java
small changes
gitignore
ignore
Merge branch 'master' into develop