Squashed commit of the following:

commit df0e8e2ccc395fe1c117577b52620e43d966b79f
Author: Vadim <Vadim@email.com>
Date:   Fri Nov 7 16:27:07 2014 +0200

    rthrt

commit f2ca7900083022bcfc11cfd54a0c62b430c60a17
Author: Vadim <Vadim@email.com>
Date:   Fri Nov 7 16:22:53 2014 +0200

    sfgksgds
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/vadim/nakatani/fragments/diagnostics_screen/RadiorakyMapFragment.java