Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master' of heroku.com:hotlynx into dev
Merge branch 'master' of heroku.com:hotlynx
solved header issue
Merge branch 'master' into dev
removed external font call