testing
Merge branch 'master' of https://github.com/jr2wolfgang/wb_test

Conflicts:
	app/controllers/IndexController.php