adding ained.php and fixing master_template
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/ained.php