small updates
delete trash
delete trash
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/ru/andro1d/project320/MainActivity.java
changed sdk lvl, added exception handling