Merge pull request #2 from AlexisDeReyes/master

fixing some cap issues
Merge pull request #3 from AlexisDeReyes/master

Adding the back button for refresh location
Merge branch 'master' of https://github.com/Julesjmpatry/TheArcticOrange
huge push
Merge branch 'dev' of https://github.com/Julesjmpatry/TheArcticOrange

Conflicts:
	Views/Init.html
	public/CSS/Init.css
	public/Scripts/Init.js
Adding Trim prototype function for strings
Fixing Emoticon Issue