Dictaphone classes were updated
Merge branch 'development' into fix5

Conflicts:
	dictaphone/src/org/oleynik/ekaterina/dictaphone/Battery.java
Merge pull request #10 from KateOl/fix5

Fix5