Merge branch 'Rails' of https://github.com/HF-Mobile-Computing/harbingernews into Rails

Conflicts:
	app/views/layouts/application.html.erb
lost some stuff from application.
Merge branch 'Rails' into development