Fixed conflicts:
	app/views/layouts/navbar.blade.php
Feature #8: Implemented the localization for the static pages(@TODO: Terms & Condition) and the header and footer texts
Feature #8: Implemented localization for Terms & Condition page, added more words and phrases to language file for registration and flash messages, renamed the vague tokens to much understandable tokens.
Feature #8: Created the tokens for the 3rd batch of translations, used the new tokens for the views.