Integrate from mobile to master branch
Merge branch 'master' of https://github.com/jellydn/beautysite

Conflicts:
	wp-content/themes/mobile_pack_base/archives.php
	wp-content/themes/mobile_pack_base/comments.php
	wp-content/themes/mobile_pack_base/footer.php
	wp-content/themes/mobile_pack_base/functions.php
	wp-content/themes/mobile_pack_base/functions_persist.php
	wp-content/themes/mobile_pack_base/group_detection.php
	wp-content/themes/mobile_pack_base/groups/nokia_high/Licence.txt

wp-content/themes/mobile_pack_base/groups/nokia_high/Release_notes_v1_2.
txt
	wp-content/themes/mobile_pack_base/groups/nokia_high/comments.php
	wp-content/themes/mobile_pack_base/groups/nokia_high/footer.php
	wp-content/themes/mobile_pack_base/groups/nokia_high/header.php

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-30x30-ic
on.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-40x40.pn
g

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-60x60.pn
g

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-box-bott
om-left.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-box-bott
om-right.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-box-flat
.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-box-top-
left.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-box-top-
right.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-branding
-background.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-form-inp
ut-shadow.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-h1-gradi
ent.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-h1-shado
w.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-home.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-link-ema
il.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-link-ext
ernal.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-link-ica
l.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-link-sms
.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-link-tel
.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-logo.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-quote.pn
g
	wp-content/themes/mobile_pack_base/groups/nokia_high/images/img-top.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-butto
n-flat.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-butto
n-rounded-left.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-butto
n-rounded-right.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-expan
d-collapse.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-foote
r.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-list.
png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-nav-r
ounded.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-open.
png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-ratin
g.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-table
-hover.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/sprite-toggl
e-switch.png

wp-content/themes/mobile_pack_base/groups/nokia_high/images/vertical-div
ider.png
	wp-content/themes/mobile_pack_base/groups/nokia_high/index.php

wp-content/themes/mobile_pack_base/groups/nokia_high/scripts/templates.j
s
	wp-content/themes/mobile_pack_base/groups/nokia_high/sidebar.php

wp-content/themes/mobile_pack_base/groups/nokia_high/styles/baseStyles.c
ss
	wp-content/themes/mobile_pack_base/groups/nokia_high/styles/reset.css

wp-content/themes/mobile_pack_base/groups/nokia_high/styles/tweaks/S406t
h.css

wp-content/themes/mobile_pack_base/groups/nokia_high/styles/tweaks/S603r
dFP2.css

wp-content/themes/mobile_pack_base/groups/nokia_high/styles/tweaks/S605t
h.css

wp-content/themes/mobile_pack_base/groups/nokia_high/styles/tweaks/maemo
.css

wp-content/themes/mobile_pack_base/groups/nokia_high/styles/tweaks/opera
mini.css

wp-content/themes/mobile_pack_base/groups/nokia_high/templates/buttons.h
tml

wp-content/themes/mobile_pack_base/groups/nokia_high/templates/content.h
tml

wp-content/themes/mobile_pack_base/groups/nokia_high/templates/form.html

wp-content/themes/mobile_pack_base/groups/nokia_high/templates/index.htm
l

wp-content/themes/mobile_pack_base/groups/nokia_high/templates/lists.htm
l

wp-content/themes/mobile_pack_base/groups/nokia_high/templates/navigatio
n.html

wp-content/themes/mobile_pack_base/groups/nokia_high/templates/table.htm
l

wp-content/themes/mobile_pack_base/groups/nokia_high/templates/utility.h
tml
	wp-content/themes/mobile_pack_base/groups/nokia_low/Licence.txt

wp-content/themes/mobile_pack_base/groups/nokia_low/Release_notes_v1_1.t
xt
	wp-content/themes/mobile_pack_base/groups/nokia_low/footer.php
	wp-content/themes/mobile_pack_base/groups/nokia_low/header.php
	wp-content/themes/mobile_pack_base/groups/nokia_low/images/img-logo.png

wp-content/themes/mobile_pack_base/groups/nokia_low/images/img-lowend.pn
g

wp-content/themes/mobile_pack_base/groups/nokia_low/styles/baseStyles-lo
w.css

wp-content/themes/mobile_pack_base/groups/nokia_low/styles/reset-low.css

wp-content/themes/mobile_pack_base/groups/nokia_low/templates/content.ht
ml
	wp-content/themes/mobile_pack_base/groups/nokia_low/templates/form.html

wp-content/themes/mobile_pack_base/groups/nokia_low/templates/index.html

wp-content/themes/mobile_pack_base/groups/nokia_low/templates/lists.html

wp-content/themes/mobile_pack_base/groups/nokia_low/templates/table.html
	wp-content/themes/mobile_pack_base/groups/nokia_mid/Licence.txt

wp-content/themes/mobile_pack_base/groups/nokia_mid/Release_notes_v1_1.t
xt
	wp-content/themes/mobile_pack_base/groups/nokia_mid/footer.php
	wp-content/themes/mobile_pack_base/groups/nokia_mid/header.php

wp-content/themes/mobile_pack_base/groups/nokia_mid/images/img-form-inpu
t-shadow.png
	wp-content/themes/mobile_pack_base/groups/nokia_mid/images/img-home.png
	wp-content/themes/mobile_pack_base/groups/nokia_mid/images/img-logo.png

wp-content/themes/mobile_pack_base/groups/nokia_mid/images/img-midrange.
png
	wp-content/themes/mobile_pack_base/groups/nokia_mid/images/img-top.png

wp-content/themes/mobile_pack_base/groups/nokia_mid/images/sprite-footer
.png

wp-content/themes/mobile_pack_base/groups/nokia_mid/images/sprite-h1.png

wp-content/themes/mobile_pack_base/groups/nokia_mid/images/sprite-h2.png

wp-content/themes/mobile_pack_base/groups/nokia_mid/images/sprite-header
.png

wp-content/themes/mobile_pack_base/groups/nokia_mid/styles/baseStyles-mi
d.css

wp-content/themes/mobile_pack_base/groups/nokia_mid/styles/reset-mid.css

wp-content/themes/mobile_pack_base/groups/nokia_mid/templates/content.ht
ml
	wp-content/themes/mobile_pack_base/groups/nokia_mid/templates/form.html

wp-content/themes/mobile_pack_base/groups/nokia_mid/templates/index.html

wp-content/themes/mobile_pack_base/groups/nokia_mid/templates/lists.html

wp-content/themes/mobile_pack_base/groups/nokia_mid/templates/table.html
	wp-content/themes/mobile_pack_base/header.php
	wp-content/themes/mobile_pack_base/img/dahs.png
	wp-content/themes/mobile_pack_base/img/high.png
	wp-content/themes/mobile_pack_base/img/radial.png
	wp-content/themes/mobile_pack_base/img/shad.png
	wp-content/themes/mobile_pack_base/index.php
	wp-content/themes/mobile_pack_base/links.php
	wp-content/themes/mobile_pack_base/screenshot.png
	wp-content/themes/mobile_pack_base/searchform.php
	wp-content/themes/mobile_pack_base/sidebar.php
	wp-content/themes/mobile_pack_base/style.css
	wp-content/themes/mobile_pack_base/style.css.nokia.css
	wp-content/themes/mobile_pack_base/style_structure.css
	wp-content/themes/mobile_pack_base/wpmp_theme_theme_admin.php
	wp-content/themes/mobile_pack_base/wpmp_theme_widget_admin.php
	wp-content/themes/mobile_pack_blue/screenshot.png
	wp-content/themes/mobile_pack_blue/style.css
	wp-content/themes/mobile_pack_blue/style.css.nokia.css
	wp-content/themes/mobile_pack_green/screenshot.png
	wp-content/themes/mobile_pack_green/style.css
	wp-content/themes/mobile_pack_green/style.css.nokia.css
	wp-content/themes/mobile_pack_red/screenshot.png
	wp-content/themes/mobile_pack_red/style.css
	wp-content/themes/mobile_pack_red/style.css.nokia.css