J-008

hehe
Revert 7d68c0a..b422c44

This rolls back to commit 7d68c0a6900ea3f8ae556b930ac3d702659c1918.
Revert "Revert 7d68c0a..b422c44"

This reverts commit 1d938396b5efa4b9e2e0e23e1ef993316bcec276, reversing
changes made to b422c4453242766064df1b7eea0075b9b5bef373.
Merge branch 'master' of https://github.com/4SSTORE/HEHE

Conflicts:
	4SStores/4SStores/Base.lproj/Main.storyboard