id change long -> int
translate comments to english
Merge remote-tracking branch 'origin/master'
Merge pull request #12 from ZiRTeam/AlecBranch

еще чуток подправил модели Категории и юзера
Merge remote-tracking branch 'origin/master'
convert date from long to Date
Merge remote-tracking branch 'origin/master'
add Sherlock
add action bar spinner
Merge remote-tracking branch 'origin/master'
actionbar done
actionbar done
Merge pull request #15 from ZiRTeam/demmy_actionbar

Demmy actionbar
Merge branch 'master' of local repository into
andrey_marina_activities_lost_found

Conflicts:
	ILost/project.properties