Dao commits
TrackDao
Android man
talk track
Merge branch 'master' of C:\Documents and Settings\Mihail\AndroidStudioProjects\Project-2 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project-1/src/main/java/pl/byd/wsg/promand/project1/presentation/SpeakerDescriptionActivity.java
	Project-1/src/main/res/layout/talks_list_cell.xml
tr