pop-up buttons functionality
Merge branch 'master' of https://github.com/icclowelondon/NeulastaGlobalNewSection

Conflicts:
	.idea/workspace.xml