removed .. from script paths checking function of login and reset views
Merge branch 'master' into william

Conflicts:
	app/views/layouts/master.blade.php
	app/views/users/login.blade.php
Merge pull request #17 from areveal/william

William