April 29th
Merge branch 'iteration-2' of https://github.com/datanets/kask-kiosk into iteration-2

Conflicts:
	KaskKiosk.v12.suo