Open file update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pl/byd/promand/Team1/OpenFileActivity.java
Merge remote-tracking branch 'origin/master'
Open file update