Merge commit '904092d2f9b6b4ba0c5e0886c2330ac6d2795414'

Conflicts:
	Base/Content/bower.json
fixed untracked files in basetemplate
Merge commit 'ec7f3a3f085e4ef738e343df6027c4c67f048a65'
Merge commit '0fb6ab1a293ef891388094b4b11ee41613700601'
added solution file
added font-awesome and pure framework to content with bower
added jquery, knockout and knockout mapping
added basescripts to bundleconfig