Merge branch 'master' of https://github.com/Torro82/IDPA

Conflicts:
	src/com/idpa/tasktransmitter2/ShowTasksActivity.java
11.06.2014