instance login muokkausta g0ljun vision mukaan
Merge branch 'master' of http://github.com/sampoz/sdp12

Conflicts:
	Titanium-UI/WebContent/second.xhtml