Saving changes from Macbookpro1 before debugging further
Saving changes before debugging further
Merge branch 'master' of https://github.com/rpolana/StemleteLocalCommands

Conflicts:
	import_news.php
	login.php
	nbproject/project.properties
	nbproject/project.xml
	show_news_counts.php
	show_news_counts.sh