Add New Siprama
Merge branch 'master' of github.com:Isht/siprama

Conflicts:
	app/controllers/shared.php