qwe
aafsfsa
Merge branch 'master' into dem

Conflicts:
	lib/uimap/base_page.rb
update test
Merge remote-tracking branch 'remotes/origin/master' into dem
Merge pull request #1 from demaW/dem

Dem