For NukeViet 3.3
Merge branch 'master' of git@github.com:nukeviet/albums.git

Conflicts:
	modules/albums/functions.php