modified:   admin/add_page.php
	modified:   admin/edit_article.php
	modified:   admin/edit_article_text.php
	modified:   admin/select_article.php
	modified:   admin/select_page.php
Merge branch 'master' of github.com:zickster/Capstone-1