edited ProgressBar
Merge branch 'master' of https://github.com/t-grab/ENA

Conflicts:
	res/layout/fragment_main.xml