update 3.06.2014
update other
Merge branch 'master' of https://github.com/zmaseluta/V3L.git

Conflicts:
	V3Learning/src/main/java/ViewModel/OthersVM.java