some changes
Merge branch 'master' of https://github.com/oles2008/Training

Conflicts:
	SightLocator/src/com/iolab/sightlocator/SightsMapFragment.java
modified resize icon method to take a new size as argument value