pull from git
pull from git
Merge remote-tracking branch 'origin/master'

Conflicts:
	viewpagerindicator/viewpagerindicator.iml
pull from git
Merge branch 'master' of https://github.com/supermfb/GaMaDian
pull from git
Merge remote-tracking branch 'origin/master'