How to pass data to views using bootstrap template library
Merge branch 'master' of https://github.com/Parametheus/apptrans

Conflicts:
	.gitignore
	application/views/layouts/main.php