Cambios
Merge branch 'master' of https://github.com/sanruigo/v_trainning

Conflicts:
	src/project/v_trainning/TrainningActivity.java
cambios